Auto merge of #2351 - rbtcollins:master, r=alexcrichton
authorbors <bors@rust-lang.org>
Tue, 2 Feb 2016 06:12:10 +0000 (06:12 +0000)
committerbors <bors@rust-lang.org>
Tue, 2 Feb 2016 06:12:10 +0000 (06:12 +0000)
commitc3006e64a9fdbe1573820dae8a89349b5e83fca7
tree48e5ce329b5f8fda814e7a16e52f3f5a524f89e8
parentc285eaf40f68ce69cdafa0065cbef01831785edf
parent824471d12f292e0aa40d455fd5b0adcb7825e9db
Auto merge of #2351 - rbtcollins:master, r=alexcrichton